Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 8 support - bring guzzle adapter in house #2547

Merged
merged 15 commits into from
Oct 5, 2020
Merged

Laravel 8 support - bring guzzle adapter in house #2547

merged 15 commits into from
Oct 5, 2020

Conversation

edalzell
Copy link
Contributor

The Guzzle Adapter package doesn't support Guzzle 7 via constraints but does work with no changes. License was MIT, so brought in house so we can support Laravel 8.

All tests pass.

@edalzell
Copy link
Contributor Author

Alrighty all tests run locally anyway.

@duncanmcclean
Copy link
Member

I think the reasons the tests are failing is due to the laravel/legacy-factories package requiring a minimum of PHP 7.3 but the tests are running for PHP 7.2 (as that's what Statamic supports).

I would have thought moving it to be a dev dependency would have sorted but doesn't seem like it. 🤔

@jasonvarga
Copy link
Member

We're only using a model factory in one file:

https://github.com/statamic/cms/blob/master/tests/Auth/Eloquent/EloquentUserTest.php#L101
https://github.com/statamic/cms/blob/master/tests/Auth/Eloquent/EloquentUserTest.php#L34-L41

We can probably just avoid using a model factory there and then get rid of the dependency.

@edalzell
Copy link
Contributor Author

Having some difficulty w/ fake user generation and non-unique ids

@edalzell edalzell marked this pull request as draft September 28, 2020 16:34
@mrmonat
Copy link

mrmonat commented Oct 1, 2020

I have opened a PR on your fork which fixes all the failing tests by not using laravel/legacy-factories but instead using Faker on the failing test directly.

PR: https://github.com/edalzell/cms/pull/415

@edalzell edalzell marked this pull request as ready for review October 1, 2020 23:36
@edalzell edalzell requested a review from jasonvarga October 1, 2020 23:36
@mrmonat
Copy link

mrmonat commented Oct 2, 2020

You have merged my PR only "half". You use "WithFaker" Trait in the Test now without using Faker in the "makeUser" method.

tests/Auth/Eloquent/EloquentUserTest.php Outdated Show resolved Hide resolved
tests/Auth/Eloquent/EloquentUserTest.php Outdated Show resolved Hide resolved
@edalzell edalzell requested a review from jasonvarga October 3, 2020 00:24
@jasonvarga jasonvarga merged commit 7abbab7 into statamic:master Oct 5, 2020
@jasonvarga
Copy link
Member

Thanks very much for this. 🎉 @mrmonat, too.

@edalzell edalzell deleted the bring-guzzle-adapter-in-house branch October 5, 2020 16:07
@duncanmcclean duncanmcclean mentioned this pull request Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants